From 206933264e36ca91d3b6768f4d06a94e941bc709 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Santiago=20Pay=C3=A0=20i=20Miralta?= Date: Fri, 6 Jun 2014 12:29:55 -0400 Subject: [PATCH] * lisp/vc/vc-hg.el (vc-hg-working-revision): Use "hg parent" and vc-hg-command. --- lisp/ChangeLog | 5 +++++ lisp/vc/vc-hg.el | 13 +++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f6a264a9d2d..e5386bf8823 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-06-06 Santiago Payà i Miralta + + * vc/vc-hg.el (vc-hg-working-revision): Use "hg parent" and + vc-hg-command (bug#17570). + 2014-06-06 Stefan Monnier * international/mule-cmds.el (ucs-names): Add special entry for BEL diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index 05b53a3eeb6..b800c64c869 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -227,14 +227,11 @@ highlighting the Log View buffer." (defun vc-hg-working-revision (file) "Hg-specific version of `vc-working-revision'." - (let ((default-directory (if (file-directory-p file) - (file-name-as-directory file) - (file-name-directory file)))) - (ignore-errors - (with-output-to-string - (process-file vc-hg-program nil standard-output nil - "log" "-l" "1" "--template" "{rev}" - (file-relative-name file)))))) + (or (ignore-errors + (with-output-to-string + (vc-hg-command standard-output 0 file + "parent" "--template" "{rev}"))) + "0")) ;;; History functions -- 2.30.2